projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eddfbc1 b819ef7)
bitkeeper revision 1.1236.1.56 (4227b2b4dQ6XlQ1LnHLnW5ENc2B7LA)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Fri, 4 Mar 2005 00:58:28 +0000 (00:58 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Fri, 4 Mar 2005 00:58:28 +0000 (00:58 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk

1  2 
tools/examples/xmexample1 patch | diff1 | diff2 | blob | history
tools/examples/xmexample2 patch | diff1 | diff2 | blob | history

diff --cc tools/examples/xmexample1
Simple merge
diff --cc tools/examples/xmexample2
Simple merge
Unnamed repository; edit this file 'description' to name the repository.